Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist the very

2004-02-13  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
	Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
	the very first time you try to save one.

diff --git a/ChangeLog b/ChangeLog
index 0c3655c9ffe5058ccc310b42f03c82c2514d06d7..b6b7c557b5dec5785a1a8f25d886a7e84eb2d961 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-13  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
+       Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
+       the very first time you try to save one.
+
 2004-02-13  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #129020.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0c3655c9ffe5058ccc310b42f03c82c2514d06d7..b6b7c557b5dec5785a1a8f25d886a7e84eb2d961 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-02-13  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
+       Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
+       the very first time you try to save one.
+
 2004-02-13  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #129020.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0c3655c9ffe5058ccc310b42f03c82c2514d06d7..b6b7c557b5dec5785a1a8f25d886a7e84eb2d961 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-02-13  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
+       Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
+       the very first time you try to save one.
+
 2004-02-13  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #129020.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0c3655c9ffe5058ccc310b42f03c82c2514d06d7..b6b7c557b5dec5785a1a8f25d886a7e84eb2d961 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-02-13  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
+       Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
+       the very first time you try to save one.
+
 2004-02-13  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #129020.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0c3655c9ffe5058ccc310b42f03c82c2514d06d7..b6b7c557b5dec5785a1a8f25d886a7e84eb2d961 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-02-13  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark):
+       Duh, duh, duh!  Don't bail out if the bookmarks file doesn't exist
+       the very first time you try to save one.
+
 2004-02-13  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #129020.

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 8d600ee12b8ebe41d61f7cfc3a079ae5bab31bb1..0117ab335ffff9727d12d749bdab14cd18d367f5 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -1077,9 +1077,15 @@ gtk_file_system_unix_add_bookmark (GtkFileSystem     *file_system,
   GSList *l;
   char *uri;
   gboolean result;
+  GError *err;
 
-  if (!bookmark_list_read (&bookmarks, error))
-    return FALSE;
+  err = NULL;
+  if (!bookmark_list_read (&bookmarks, &err) && err->code != G_FILE_ERROR_NOENT)
+    {
+      g_propagate_error (error, err);
+      g_error_free (err);
+      return FALSE;
+    }
 
   result = FALSE;